Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234457
Change subject: Lint fixes for I695ce535 and I526d5737
......................................................................
Lint fixes for I695ce535 and I526d5737
Change-Id: Id43cd6575710505acbe598ce9bdf6c14cd4981a3
---
M pybal/test/test_config.py
1 file changed, 21 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal
refs/changes/57/234457/1
diff --git a/pybal/test/test_config.py b/pybal/test/test_config.py
index 29dfa68..e32e5aa 100644
--- a/pybal/test/test_config.py
+++ b/pybal/test/test_config.py
@@ -6,17 +6,18 @@
This module contains tests for `pybal.config`.
"""
-import mock
-import tempfile
+import json
import os
+import tempfile
+
+from twisted.python.failure import Failure
+import mock
import pybal
import pybal.config
-import json
-
from .fixtures import PyBalTestCase, MockClientGetPage
-from twisted.python.failure import Failure
+
class DummyConfigurationObserver(pybal.config.ConfigurationObserver):
urlScheme = 'dummy://'
@@ -92,8 +93,10 @@
"mw1201": {"enabled": false, "weight": 1 }
}
"""
- expected_config = {'mw1200': {'enabled': True, 'weight': 10},
- 'mw1201': {'enabled': False, 'weight': 1}}
+ expected_config = {
+ 'mw1200': {'enabled': True, 'weight': 10},
+ 'mw1201': {'enabled': False, 'weight': 1},
+ }
self.assertEquals(self.observer.parseJsonConfig(json_config),
expected_config)
invalid_config = "{[]"
@@ -102,17 +105,19 @@
def testParseLegacyConfig(self):
"""Test `FileConfigurationObserver.parseLegacyConfig`"""
- legacy_config = """
-{'host': 'mw1200', 'weight': 10, 'enabled': True }
-{'host': 'mw1201', 'weight': 1, 'enabled': False }
- """
- expected_config = {'mw1200': {'enabled': True, 'weight': 10},
- 'mw1201': {'enabled': False, 'weight': 1}}
+ legacy_config = '\n'.join((
+ "{'host': 'mw1200', 'weight': 10, 'enabled': True }",
+ "{'host': 'mw1201', 'weight': 1, 'enabled': False }",
+ ))
+ expected_config = {
+ 'mw1200': {'enabled': True, 'weight': 10},
+ 'mw1201': {'enabled': False, 'weight': 1},
+ }
self.assertEquals(self.observer.parseLegacyConfig(legacy_config),
expected_config)
- invalid_config="""
-{'host': 'something'}
- """
+
+ invalid_config= "{'host': 'something'}\n"
+
# Needed for nose to pass... it doesn't really get raised
self.assertEquals(self.observer.parseLegacyConfig(invalid_config), {})
self.flushLoggedErrors(KeyError)
--
To view, visit https://gerrit.wikimedia.org/r/234457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id43cd6575710505acbe598ce9bdf6c14cd4981a3
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
