This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/run-tests-client.sh b/run-tests-client.sh | |
deleted file mode 100755 | |
index 00aa0f4..0000000 | |
--- a/run-tests-client.sh | |
+++ /dev/null | |
@@ -1,2 +0,0 @@ | |
-#!/bin/sh | |
-mocha-phantomjs go/base/static/js/test/runner.html | |
diff --git a/run-tests-js.sh b/run-tests-js.sh | |
new file mode 100755 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/package.json b/package.json | |
index 34e0d11..89251db 100644 | |
--- a/package.json | |
+++ b/package.json | |
@@ -1,6 +1,6 @@ | |
{ | |
"name": "diamondash", | |
- "version": "0.1.0", | |
+ "version": "0.2.0", | |
"scripts": { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/diamondash/client/tests/components/structures.test.js b/diamondash/client/tests/components/structures.test.js | |
index 4722b8b..90cb04d 100644 | |
--- a/diamondash/client/tests/components/structures.test.js | |
+++ b/diamondash/client/tests/components/structures.test.js | |
@@ -11,12 +11,12 @@ describe("diamondash.components.structures", function() { | |
}); | |
describe(".add", function() { | |
- it("should register a widget type", function() { | |
+ it("should register the given item", function() { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/.gitignore b/.gitignore | |
index 578b1af..379b4d1 100644 | |
--- a/.gitignore | |
+++ b/.gitignore | |
@@ -28,3 +28,5 @@ distribute-0.6.10.tar.gz | |
/test_results.xml | |
/pep8.txt | |
/docs/_build/ | |
+mochacov.lcov | |
+/coverage/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/vumigo/manifests/init.pp b/modules/vumigo/manifests/init.pp | |
index a8b003e..9d1032f 100644 | |
--- a/modules/vumigo/manifests/init.pp | |
+++ b/modules/vumigo/manifests/init.pp | |
@@ -76,7 +76,7 @@ class vumigo { | |
numprocs_start => 0, | |
}, | |
go_metrics_collector => { | |
- config = 'go_metrics_collector.yaml', | |
+ config => 'go_metrics_collector.yaml', |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/go/apps/http_api/tests/test_vumi_app.py b/go/apps/http_api/tests/test_vumi_app.py | |
index f87deaa..ff8e385 100644 | |
--- a/go/apps/http_api/tests/test_vumi_app.py | |
+++ b/go/apps/http_api/tests/test_vumi_app.py | |
@@ -327,13 +327,13 @@ class StreamingHTTPWorkerTestCase(AppWorkerTestCase): | |
url = '%s/%s/metrics.json' % (self.url, self.conversation.key) | |
response = yield http_request_full( | |
url, json.dumps(metric_data), self.auth_headers, method='PUT') | |
- | |
+ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/go/vumitools/metrics.py b/go/vumitools/metrics.py | |
index fa02967..751df3a 100644 | |
--- a/go/vumitools/metrics.py | |
+++ b/go/vumitools/metrics.py | |
@@ -5,6 +5,10 @@ from vumi.blinkenlights.metrics import Metric | |
class GoMetric(object): | |
+ """ | |
+ Encapsulates name retrieval, value retrieval and publishing for Go metrics. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/vumi/tests/utils.py b/vumi/tests/utils.py | |
index 460853a..18a60de 100644 | |
--- a/vumi/tests/utils.py | |
+++ b/vumi/tests/utils.py | |
@@ -20,6 +20,7 @@ from vumi.utils import vumi_resource_path, flatten_generator, LogFilterSite | |
from vumi.service import get_spec, Worker, WorkerCreator | |
from vumi.message import TransportUserMessage, TransportEvent | |
from vumi.tests.fake_amqp import FakeAMQPBroker, FakeAMQClient | |
+from vumi.blinklights import MetricManager | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/vumi/blinkenlights/metrics.py b/vumi/blinkenlights/metrics.py | |
index 331f43d..386fdac 100644 | |
--- a/vumi/blinkenlights/metrics.py | |
+++ b/vumi/blinkenlights/metrics.py | |
@@ -46,7 +46,7 @@ class MetricManager(Publisher): | |
def start(self, channel): | |
"""Start publishing metrics in a loop.""" | |
super(MetricManager, self).start(channel) | |
- self._task = LoopingCall(self._publish_metrics) | |
+ self._task = LoopingCall(self.publish_metrics) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/go/vumitools/app_worker.py b/go/vumitools/app_worker.py | |
index 9c70fda..db42a75 100644 | |
--- a/go/vumitools/app_worker.py | |
+++ b/go/vumitools/app_worker.py | |
@@ -41,7 +41,7 @@ class GoApplicationConfigData(object): | |
def has_key(self, field_name): | |
if self.conv.config and field_name in self.conv.config: | |
return True | |
- return self.config_dict.has_key(field_name) | |
+ return field_name in self.config_dict |