Merge lp:~teknico/juju-gui/get-service-tests-in-py-env into lp:juju-gui/experimental

[Nicola Larosa]

Add tests to the Py env get_service.

Add tests and a doc comment to get_service in the Python environment.

https://codereview.appspot.com/8307043/

[Nicola Larosa (teknico)]

Reviewers: mp+156805_code.launchpad.net,

Message:
Please take a look.

Description:
Add tests to the Py env get_service.

Add tests and a doc comment to get_service in the Python environment.

https://code.launchpad.net/~teknico/juju-gui/get-service-tests-in-py-env/+merge/156805

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/8307043/

Affected files:
   A [revision details]
   M app/store/env/go.js
   M app/store/env/python.js
   M test/test_env_python.js

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: test/test_env_python.js
=== modified file 'test/test_env_python.js'
--- test/test_env_python.js 2013-04-02 23:30:12 +0000
+++ test/test_env_python.js 2013-04-03 11:12:24 +0000
@@ -121,6 +121,43 @@
          request_id: msg.request_id});
      });

+ it('successfully gets service configuration', function() {
+ var result, service_name;
+ var expected = {
+ 'config': {'cfg_key': 'cfg_val'},
+ 'constraints': {'cstr_key': 'cstr_val'}
+ };
+ env.get_service('mysql', function(data) {
+ service_name = data.service_name;
+ result = data.result;
+ });
+ msg = conn.last_message();
+ conn.msg({
+ request_id: msg.request_id,
+ service_name: 'mysql',
+ result: expected
+ });
+ assert.equal(service_name, 'mysql');
+ assert.deepEqual(expected, result);
+ });
+
+ it('handles failed get service', function() {
+ var service_name;
+ var err;
+ env.get_service('yoursql', function(data) {
+ service_name = data.service_name;
+ err = data.err;
+ });
+ msg = conn.last_message();
+ conn.msg({
+ request_id: msg.request_id,
+ service_name: 'yoursql',
+ err: 'service "yoursql" not found'
+ });
+ assert.equal(service_name, 'yoursql');
+ assert.equal(err, 'service "yoursql" not found');
+ });
+
      it('successfully adds a relation', function(done) {
        var endpoints, result;
        endpointA = ['mysql', {name: 'database'}];

Index: app/store/env/go.js
=== modified file 'app/store/env/go.js'
--- app/store/env/go.js 2013-04-02 23:30:12 +0000
+++ app/store/env/go.js 2013-04-03 11:12:24 +0000
@@ -640,7 +640,7 @@
       * operation is performed. It will receive an object containing:
       * err - a string describing the problem (if an error occurred),
       * service_name - the name of the service,
- * results: an object containing all of the configuration data for
+ * result: an object containing all of the configuration data for
       * the service.
       * @return {undefined} Sends a message to the server only.
       */

Index: app/store/env/python.js
=== modified file 'app/store/env/python.js'
--- app/store/env/python.js 2013-04-02 23:30:12 +0000
+++ app/store/env/python.js 2013-04-03 11:12:24 +0000
@@ -203,...

[Jeff Pihach (hatch)]

LGTM - Thanks for this!

https://codereview.appspot.com/8307043/

[Richard Harding (rharding)]

LGTM

https://codereview.appspot.com/8307043/

[lp:~teknico/juju-gui/get-service-tests-in-py-env]

491. By Nicola Larosa on 2013-04-03

Merge from trunk.

[Nicola Larosa (teknico)]

*** Submitted:

Add tests to the Py env get_service.

Add tests and a doc comment to get_service in the Python environment.

R=jeff.pihach, rharding
CC=
https://codereview.appspot.com/8307043

https://codereview.appspot.com/8307043/

=== modified file 'app/store/env/go.js'
--- app/store/env/go.js	2013-04-02 23:30:12 +0000
+++ app/store/env/go.js	2013-04-03 16:48:23 +0000
@@ -640,7 +640,7 @@
      *  operation is performed. It will receive an object containing:
      *    err - a string describing the problem (if an error occurred),
      *    service_name - the name of the service,
-     *    results: an object containing all of the configuration data for
+     *    result: an object containing all of the configuration data for
      *      the service.
      * @return {undefined} Sends a message to the server only.
      */

=== modified file 'app/store/env/python.js'
--- app/store/env/python.js	2013-04-02 23:30:12 +0000
+++ app/store/env/python.js	2013-04-03 16:48:23 +0000
@@ -203,6 +203,19 @@
       this._send_rpc({op: 'get_charm', charm_url: charmURL}, callback);
     },
 
+    /**
+       Get the configuration for the given service.
+
+       @method get_service
+       @param {String} service_name The service name.
+       @param {Function} callback A callable that must be called once the
+        operation is performed. It will receive an object containing:
+          err - a string describing the problem (if an error occurred),
+          service_name - the name of the service,
+          result: an object containing all of the configuration data for
+            the service.
+       @return {undefined} Sends a message to the server only.
+     */
     get_service: function(service_name, callback) {
       this._send_rpc(
           {'op': 'get_service', 'service_name': service_name}, callback);

=== modified file 'test/test_env_python.js'
--- test/test_env_python.js	2013-04-02 23:30:12 +0000
+++ test/test_env_python.js	2013-04-03 16:48:23 +0000
@@ -121,6 +121,43 @@
         request_id: msg.request_id});
     });
 
+    it('successfully gets service configuration', function() {
+      var result, service_name;
+      var expected = {
+        'config': {'cfg_key': 'cfg_val'},
+        'constraints': {'cstr_key': 'cstr_val'}
+      };
+      env.get_service('mysql', function(data) {
+        service_name = data.service_name;
+        result = data.result;
+      });
+      msg = conn.last_message();
+      conn.msg({
+        request_id: msg.request_id,
+        service_name: 'mysql',
+        result: expected
+      });
+      assert.equal(service_name, 'mysql');
+      assert.deepEqual(expected, result);
+    });
+
+    it('handles failed get service', function() {
+      var service_name;
+      var err;
+      env.get_service('yoursql', function(data) {
+        service_name = data.service_name;
+        err = data.err;
+      });
+      msg = conn.last_message();
+      conn.msg({
+        request_id: msg.request_id,
+        service_name: 'yoursql',
+        err: 'service "yoursql" not found'
+      });
+      assert.equal(service_name, 'yoursql');
+      assert.equal(err, 'service "yoursql" not found');
+    });
+
     it('successfully adds a relation', function(done) {
       var endpoints, result;
       endpointA = ['mysql', {name: 'database'}];