Merge lp:~1chb1n/charms/trusty/neutron-gateway/next1507-amulet-cleanup into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

[Ryan Beisner]

Oops, this syntax check pass caught that the neutron-gateway charm has been testing the next charm in deployments against stable charm counterparts.

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #6647 neutron-gateway-next for 1chb1n mp266289
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6647/

[Ryan Beisner (1chb1n)]

Oops, this syntax check pass caught that the neutron-gateway charm has been testing the next charm in deployments against stable charm counterparts.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7194 neutron-gateway-next for 1chb1n mp266289
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7194/

[Billy Olsen (billy-olsen)]

LGTM, Approved.

review: Approve

=== removed file 'tests/018-basic-utopic-juno'
--- tests/018-basic-utopic-juno	2015-06-25 17:58:14 +0000
+++ tests/018-basic-utopic-juno	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/usr/bin/python
-
-"""Amulet tests on a basic quantum-gateway deployment on utopic-juno."""
-
-from basic_deployment import NeutronGatewayBasicDeployment
-
-if __name__ == '__main__':
-    deployment = NeutronGatewayBasicDeployment(series='utopic')
-    deployment.run_tests()

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-07-15 17:22:52 +0000
+++ tests/basic_deployment.py	2015-07-29 18:24:52 +0000
@@ -25,7 +25,7 @@
     """Amulet tests on a basic neutron-gateway deployment."""
 
     def __init__(self, series, openstack=None, source=None, git=False,
-                 stable=True):
+                 stable=False):
         """Deploy the entire test environment."""
         super(NeutronGatewayBasicDeployment, self).__init__(series, openstack,
                                                             source, stable)