Skip to content

Commit

Permalink
Fix unit tests for FDB changes
Browse files Browse the repository at this point in the history
  • Loading branch information
cdonati committed Aug 15, 2019
1 parent 2210e42 commit 756a36e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions test/test_appscale_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ def setUp(self):
'EC2_ACCESS_KEY': 'baz',
'EC2_SECRET_KEY': 'baz',
'EC2_URL': '',
'fdb_clusterfile_content': None,
}

# finally, construct a http payload for mocking that the below
Expand Down
12 changes: 8 additions & 4 deletions test/test_local_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ def test_generate_deployment_params(self):
zone='my-zone-1b', verbose=True, user_commands=[], flower_password="abc",
default_max_appserver_memory=ParseArgs.DEFAULT_MAX_APPSERVER_MEMORY,
EC2_ACCESS_KEY='baz', EC2_SECRET_KEY='baz', EC2_URL='',
login_host='public1', aws_subnet_id=None, aws_vpc_id=None)
login_host='public1', aws_subnet_id=None, aws_vpc_id=None,
fdb_clusterfile_content=None)
node_layout = NodeLayout({
'table' : 'cassandra',
'infrastructure' : "ec2",
Expand Down Expand Up @@ -141,7 +142,8 @@ def test_generate_deployment_params(self):
'EC2_SECRET_KEY': 'baz',
'EC2_URL': '',
'aws_subnet_id': None,
'aws_vpc_id': None
'aws_vpc_id': None,
'fdb_clusterfile_content': None
}
actual = LocalState.generate_deployment_params(options, node_layout,
{'max_spot_price':'1.23'})
Expand All @@ -160,7 +162,8 @@ def test_generate_deployment_params_no_login(self):
zone='my-zone-1b', verbose=True, user_commands=[], flower_password="abc",
default_max_appserver_memory=ParseArgs.DEFAULT_MAX_APPSERVER_MEMORY,
EC2_ACCESS_KEY='baz', EC2_SECRET_KEY='baz', EC2_URL='',
login_host=None, aws_subnet_id=None, aws_vpc_id=None)
login_host=None, aws_subnet_id=None, aws_vpc_id=None,
fdb_clusterfile_content=None)
node_layout = NodeLayout({
'table': 'cassandra',
'infrastructure': "ec2",
Expand Down Expand Up @@ -197,7 +200,8 @@ def test_generate_deployment_params_no_login(self):
'EC2_SECRET_KEY': 'baz',
'EC2_URL': '',
'aws_subnet_id': None,
'aws_vpc_id': None
'aws_vpc_id': None,
'fdb_clusterfile_content': None
}
actual = LocalState.generate_deployment_params(options, node_layout,
{'max_spot_price': '1.23'})
Expand Down

0 comments on commit 756a36e

Please sign in to comment.