Skip to content
This repository has been archived by the owner on Jan 6, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/ImmobilienScout24/crassus
Browse files Browse the repository at this point in the history
…into back_channel_lambda
  • Loading branch information
karolyi committed Nov 23, 2015
2 parents 87f2e11 + 40befdd commit b647b9f
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/integrationtest/python/crassus_integration_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ def create_invoker_role(self):

def assume_role(self, invoker_role):
credentials = self.sts_client.assume_role(
RoleArn=invoker_role.arn, RoleSessionName='{0}'.format(
self.test_id))['Credentials']
RoleArn=invoker_role.arn, RoleSessionName='crassus-it')['Credentials']

ec2 = boto3.client(service_name='ec2', region_name=REGION_NAME,
aws_access_key_id=credentials['AccessKeyId'],
Expand Down Expand Up @@ -132,7 +131,7 @@ def assert_update_successful(self):
logger.info('Checking output from {0}: {1}'.format(
hello_world_url, hello_world))

if re.compile('.*?python-docker-hello-world-webapp 40.*').match(
if re.compile('.*?python-docker-hello-world-webapp.*').match(
hello_world):
update_successful = True
break
Expand Down Expand Up @@ -265,4 +264,4 @@ def ignore_client_error(self, function):


if __name__ == "__main__":
unittest.main()
unittest.main()

0 comments on commit b647b9f

Please sign in to comment.