Переглянути джерело

3501 - Remove a test and fix other

Signed-off-by: Jesus Rodriguez Tinoco <[email protected]>
Jesus Tinoco 9 роки тому
батько
коміт
90beeaf21c
1 змінених файлів з 2 додано та 17 видалено
  1. 2 17
      tests/acceptance/cli_test.py

+ 2 - 17
tests/acceptance/cli_test.py

@@ -1990,26 +1990,11 @@ class CLITestCase(DockerClientTestCase):
     def test_images(self):
         self.project.get_service('simple').create_container()
         result = self.dispatch(['images'])
-        assert 'simplecomposefile_simple' in result.stdout
+        assert 'busybox' in result.stdout
 
     def test_images_default_composefile(self):
         self.base_dir = 'tests/fixtures/multiple-composefiles'
         self.dispatch(['up', '-d'])
         result = self.dispatch(['images'])
 
-        self.assertIn('multiplecomposefiles_simple', result.stdout)
-        self.assertIn('multiplecomposefiles_another', result.stdout)
-        self.assertNotIn('multiplecomposefiles_yetanother', result.stdout)
-
-    def test_images_alternate_composefile(self):
-        config_path = os.path.abspath(
-            'tests/fixtures/multiple-composefiles/compose2.yml')
-        self._project = get_project(self.base_dir, [config_path])
-
-        self.base_dir = 'tests/fixtures/multiple-composefiles'
-        self.dispatch(['-f', 'compose2.yml', 'up', '-d'])
-        result = self.dispatch(['-f', 'compose2.yml', 'images'])
-
-        self.assertNotIn('multiplecomposefiles_simple', result.stdout)
-        self.assertNotIn('multiplecomposefiles_another', result.stdout)
-        self.assertIn('multiplecomposefiles_yetanother', result.stdout)
+        self.assertIn('busybox', result.stdout)