Skip to content

Commit

Permalink
Merge pull request #311 from tbeckham/testing
Browse files Browse the repository at this point in the history
Fix for ELB SSL test
  • Loading branch information
tbeckham committed Jan 8, 2015
2 parents c7fb4ff + 636b100 commit 7bd81ca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion eucaops/elbops.py
Expand Up @@ -307,7 +307,7 @@ def remove_lb_listener(self, lb_name, port):
self.debug("removing listener")
self.elb.delete_load_balancer_listeners(name=lb_name, ports=[port])

def add_server_cert(self, cert_name, cert_dir= abspath("testcases/cloud_user/elb/test_data"), cert_file="ssl_server_certs_basics.crt",
def add_server_cert(self, cert_name, cert_dir="./test_data", cert_file="ssl_server_certs_basics.crt",
key_file="ssl_server_certs_basics.pem"):
cert_body = open(join(cert_dir, cert_file)).read()
cert_key = open(join(cert_dir, key_file)).read()
Expand Down

0 comments on commit 7bd81ca

Please sign in to comment.