Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: conftool: fix integration tests
......................................................................
conftool: fix integration tests
Change-Id: Iceff49e0da03b296ad14c2dab6c9e049918716b7
---
M conftool/tests/integration/__init__.py
M conftool/tests/integration/test_syncer.py
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/conftool/tests/integration/__init__.py
b/conftool/tests/integration/__init__.py
index ab2f4e8..8341498 100644
--- a/conftool/tests/integration/__init__.py
+++ b/conftool/tests/integration/__init__.py
@@ -64,6 +64,7 @@
@classmethod
def setUpClass(cls):
+ cls.init_failed = False
program = cls._get_exe()
cls.directory = tempfile.mkdtemp(prefix='conftool')
cls.processHelper = EtcdProcessHelper(
@@ -78,7 +79,7 @@
cls.log.critical("KVObject.setup() failed. sys.exit(%s)"
% system_exit,
exc_info=1)
- cls.init_failed = True
+ cls.init_failed = True
def setUp(self):
if self.init_failed:
diff --git a/conftool/tests/integration/test_syncer.py
b/conftool/tests/integration/test_syncer.py
index a209923..2de452f 100644
--- a/conftool/tests/integration/test_syncer.py
+++ b/conftool/tests/integration/test_syncer.py
@@ -26,8 +26,8 @@
def test_tag_files(self):
d = os.path.join(test_base, 'fixtures')
res = syncer.tag_files(d)
- self.assertEquals(
- res['services'][0], os.path.join(d, 'services/data.yaml'))
+ self.assertIn(os.path.join(d, 'services/data.yaml'),
+ res['services'])
def test_load_service(self):
cluster = 'test'
--
To view, visit https://gerrit.wikimedia.org/r/226701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iceff49e0da03b296ad14c2dab6c9e049918716b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/conftool
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
