summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjiansong <jian.song@easystack.cn>2018-01-31 01:49:58 -0800
committerjiansong <jian.song@easystack.cn>2018-01-31 01:51:18 -0800
commit21dcb414e5286e84793db7ffa783cc7546c4d39c (patch)
tree1f51f3509408287246bca61e4c96216ee4db5654
parent393c5f8c0083196362068f4101e47110e60ab983 (diff)
downloadtrove-21dcb414e5286e84793db7ffa783cc7546c4d39c.tar.gz
Fix gate error
Looks like SQLAlchemy in version 1.2.x checks if the boolean value is None, True, False, 1, or 0. We used a "1" in our test, which does not seem to meet the requirements. In the meantime, if we change it to 1 here, our function section needs to be changed as well. Change-Id: I8df2118fee12fd9dd02caf96a23bc59652efbed7
-rw-r--r--trove/cmd/manage.py3
-rw-r--r--trove/tests/unittests/mgmt/test_datastores.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/trove/cmd/manage.py b/trove/cmd/manage.py
index cadd21d3..76500d31 100644
--- a/trove/cmd/manage.py
+++ b/trove/cmd/manage.py
@@ -212,7 +212,8 @@ def main():
'packages', help='Packages required by the datastore version that '
'are installed on the guest image.')
parser.add_argument(
- 'active', help='Whether the datastore version is active or not. '
+ 'active', type=int,
+ help='Whether the datastore version is active or not. '
'Accepted values are 0 and 1.')
parser = subparser.add_parser(
diff --git a/trove/tests/unittests/mgmt/test_datastores.py b/trove/tests/unittests/mgmt/test_datastores.py
index 0305dc23..94cf2e0b 100644
--- a/trove/tests/unittests/mgmt/test_datastores.py
+++ b/trove/tests/unittests/mgmt/test_datastores.py
@@ -31,10 +31,10 @@ class TestDatastoreVersion(trove_testtools.TestCase):
models.update_datastore(name='test_ds', default_version=None)
models.update_datastore_version(
'test_ds', 'test_vr1', 'mysql',
- '154b350d-4d86-4214-9067-9c54b230c0da', 'pkg-1', '1')
+ '154b350d-4d86-4214-9067-9c54b230c0da', 'pkg-1', 1)
models.update_datastore_version(
'test_ds', 'test_vr2', 'mysql',
- '154b350d-4d86-4214-9067-9c54b230c0da', 'pkg-1', '1')
+ '154b350d-4d86-4214-9067-9c54b230c0da', 'pkg-1', 1)
self.ds = models.Datastore.load('test_ds')
self.ds_version2 = models.DatastoreVersion.load(self.ds, 'test_vr2')