← Back to branch summary

~veebers/juju-ci-tools/perf-initial-heatmap-details

« back to all changes in this revision

Viewing changes to tests/test_industrial_test.py

  • Committer: Aaron Bentley
  • Date: 2016-06-01 13:57:51 UTC
  • mfrom: (1445 trunk)
  • mto: This revision was merged to the branch mainline in revision 1447.
  • Revision ID: aaron.bentley@canonical.com-20160601135751-ra426srp52pl73rh
Merge trunk into application-not-service.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_industrial_test.py
1946
1946
        self.assertEqual(metadata['name'], 'mycharm')
1947
1947
        self.assertIn('summary', metadata)
1948
1948
        self.assertIn('description', metadata)
 
1949
        self.assertEqual(['trusty'], metadata['series'])
1949
1950
        if client.version.startswith('1.'):
1950
 
            self.assertIn('series', metadata)
1951
1951
            charm_path = os.path.join('local:trusty', 'mycharm')
1952
1952
            assert_juju_call(self, cc_mock, client, (
1953
1953
                'juju', '--show-log', 'deploy', '-e', 'steve', charm_path,
1954
1954
                '--repository', temp_repository))
1955
1955
            option = '-e'
1956
1956
        else:
1957
 
            self.assertIn('series', metadata)
1958
1957
            charm_path = os.path.join(temp_repository, 'trusty', 'mycharm')
1959
1958
            assert_juju_call(self, cc_mock, client, (
1960
1959
                'juju', '--show-log', 'deploy', '-m', 'steve', charm_path))