diff options
| author | Yves Duhem <yves.duhem@mongodb.com> | 2017-07-26 10:12:48 -0400 |
|---|---|---|
| committer | Yves Duhem <yves.duhem@mongodb.com> | 2017-07-26 10:12:48 -0400 |
| commit | 6cc2dfe7edd312b8596355edef454e15988e350e (patch) | |
| tree | 8486f13b2706c59ec670b74e0c7b4081f3fdb623 /buildscripts/tests | |
| parent | 6a1bc434f7525d40a6b84c9b03cbd76a74b1f5fb (diff) | |
| download | mongo-6cc2dfe7edd312b8596355edef454e15988e350e.tar.gz | |
Revert "SERVER-30308 Handle absent test_flags in combined_resmoke_args()"
This reverts commit 645172dfe76a2a25b6c19f3ba6086c8605c617ab.
Diffstat (limited to 'buildscripts/tests')
| -rw-r--r-- | buildscripts/tests/ciconfig/evergreen.yml | 6 | ||||
| -rw-r--r-- | buildscripts/tests/ciconfig/test_evergreen.py | 15 |
2 files changed, 3 insertions, 18 deletions
diff --git a/buildscripts/tests/ciconfig/evergreen.yml b/buildscripts/tests/ciconfig/evergreen.yml index 7931bf7a586..9777fb5ef46 100644 --- a/buildscripts/tests/ciconfig/evergreen.yml +++ b/buildscripts/tests/ciconfig/evergreen.yml @@ -148,9 +148,3 @@ buildvariants: - name: resmoke_task distros: - pdp-11 -- name: debian - display_name: Debian - run_on: - - debian-stretch - tasks: - - name: resmoke_task diff --git a/buildscripts/tests/ciconfig/test_evergreen.py b/buildscripts/tests/ciconfig/test_evergreen.py index cf1dbddfb4c..56de9bca3d3 100644 --- a/buildscripts/tests/ciconfig/test_evergreen.py +++ b/buildscripts/tests/ciconfig/test_evergreen.py @@ -43,11 +43,10 @@ class TestEvergreenProjectConfig(unittest.TestCase): self.assertIn("resmoke_task", self.conf.task_names) def test_list_variants(self): - self.assertEqual(3, len(self.conf.variants)) - self.assertEqual(3, len(self.conf.variant_names)) + self.assertEqual(2, len(self.conf.variants)) + self.assertEqual(2, len(self.conf.variant_names)) self.assertIn("osx-108", self.conf.variant_names) self.assertIn("ubuntu", self.conf.variant_names) - self.assertIn("debian", self.conf.variant_names) def test_get_variant(self): variant = self.conf.get_variant("osx-108") @@ -56,11 +55,10 @@ class TestEvergreenProjectConfig(unittest.TestCase): self.assertEqual("osx-108", variant.name) def test_list_distro_names(self): - self.assertEqual(4, len(self.conf.distro_names)) + self.assertEqual(3, len(self.conf.distro_names)) self.assertIn("localtestdistro", self.conf.distro_names) self.assertIn("ubuntu1404-test", self.conf.distro_names) self.assertIn("pdp-11", self.conf.distro_names) - self.assertIn("debian-stretch", self.conf.distro_names) class TestTask(unittest.TestCase): @@ -179,16 +177,9 @@ class TestVariant(unittest.TestCase): self.assertEqual(variant_ubuntu, task.variant) self.assertIn(task_name, variant_ubuntu.task_names) - # Check combined_resmoke_args when test_flags is set on the variant resmoke_task = variant_ubuntu.get_task("resmoke_task") self.assertEqual("--suites=somesuite --storageEngine=mmapv1 --param=value --ubuntu", resmoke_task.combined_resmoke_args) - # Check combined_resmoke_args when test_flags is not set on the variant - variant_debian = self.conf.get_variant("debian") - resmoke_task = variant_debian.get_task("resmoke_task") - self.assertEqual("--suites=somesuite --storageEngine=mmapv1", - resmoke_task.combined_resmoke_args) - if __name__ == "__main__": unittest.main() |