← Back to branch summary

~ibmcharmers/charms/trusty/was-base/devel

« back to all changes in this revision

Viewing changes to tests/10-bundles-test.py

  • Committer: Geetha S
  • Date: 2015-07-14 16:19:18 UTC
  • Revision ID: geethas1@in.ibm.com-20150714161918-kn337koosgwk11nz
WAS Base changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/10-bundles-test.py
36
36
                  "Edit local.yaml or tests/00-setup and run it again.")
37
37
            sys.exit(1)
38
38
 
39
 
<<<<<<< TREE
40
39
         bundle_path = os.path.join(os.path.dirname(__file__), 'bundles.yaml')
41
40
         with open(bundle_path, 'r') as bundle_file:
42
41
            contents = yaml.safe_load(bundle_file)
43
42
         d.load(contents)
44
43
#       d.add("haproxy")
45
 
=======
46
 
    bundle_path = os.path.join(os.path.dirname(__file__), 'bundles.yaml')
47
 
    with open(bundle_path, 'r') as bundle_file:
48
 
       contents = yaml.safe_load(bundle_file)
49
 
       d.load(contents)
50
 
       d.add("haproxy")
51
 
>>>>>>> MERGE-SOURCE
52
 
       
 
44
 
 
45
        bundle_path = os.path.join(os.path.dirname(__file__), 'bundles.yaml')
 
46
        with open(bundle_path, 'r') as bundle_file:
 
47
           contents = yaml.safe_load(bundle_file)
 
48
        d.load(contents)
 
49
        d.add("haproxy")
 
50
      
53
51
        # Software doesn't actually install until you accept the license
54
 
<<<<<<< TREE
55
 
         d.configure('was-base', {'accept-ibm-websphere-license': True, 'accept-ibm-im-license': True,'was_url': url, 'im_file_name': pkg })
56
 
         d.setup(seconds_to_wait)
57
 
         cls.d = d
58
 
#       d.relate('haproxy:reverseproxy', 'was-base:website')
59
 
       # d.sentry.wait(seconds_to_wait)
60
 
 
61
 
=======
62
 
       d.configure('was-base', {'accept-ibm-websphere-license': True, 'accept-ibm-im-license': True,'was_url': url, 'im_file_name': pkg })
63
 
       d.configure('haproxy', {'enable_monitoring': True })
64
 
       d.relate('haproxy:reverseproxy', 'was-base:website')
65
 
       d.setup(seconds_to_wait)
66
 
       d.sentry.wait(seconds_to_wait)
67
 
       cls.d = d
68
 
>>>>>>> MERGE-SOURCE
69
 
 
 
52
        d.configure('was-base', {'accept-ibm-websphere-license': True, 'accept-ibm-im-license': True,'was_url': url, 'im_file_name': pkg })
 
53
        d.setup(seconds_to_wait)
 
54
        cls.d = d
 
55
        d.relate('haproxy:reverseproxy', 'was-base:website')
 
56
        d.sentry.wait(seconds_to_wait)
 
57
 
 
58
        d.configure('was-base', {'accept-ibm-websphere-license': True, 'accept-ibm-im-license': True,'was_url': url, 'im_file_name': pkg })
 
59
        d.configure('haproxy', {'enable_monitoring': True })
 
60
        d.relate('haproxy:reverseproxy', 'was-base:website')
 
61
        d.setup(seconds_to_wait)
 
62
        d.sentry.wait(seconds_to_wait)
 
63
        cls.d = d
70
64
    def test_deployed(self):
71
65
        self.assertTrue(self.d.deployed)
72
66
 
84
78
        # Raise an exception if the url was not a valid web page.
85
79
        response.raise_for_status()
86
80
 
87
 
<<<<<<< TREE
88
 
=======
89
 
 
90
 
 
91
 
>>>>>>> MERGE-SOURCE
92
81
if __name__ == '__main__':
93
82
    unittest.main()
94
83