diff options
author | Monty Taylor <mordred@inaugust.com> | 2016-10-13 11:04:12 -0500 |
---|---|---|
committer | Monty Taylor <mordred@inaugust.com> | 2016-10-13 11:25:33 -0500 |
commit | 968571920b33dc4b5190581abe6140945b49da6d (patch) | |
tree | 6f07526ff224ec5bc7afbc90dfd92ed0780d0dee /ttrun | |
parent | 644d93f4d632c302cc8cd8ef5c465acfa4e478d5 (diff) |
A few structural cleanups
Diffstat (limited to 'ttrun')
-rw-r--r-- | ttrun/__init__.py | 25 | ||||
-rw-r--r-- | ttrun/tests/base.py | 23 | ||||
-rw-r--r-- | ttrun/tests/test_ttrun.py | 29 |
3 files changed, 30 insertions, 47 deletions
diff --git a/ttrun/__init__.py b/ttrun/__init__.py index 8dd2e92..fbce105 100644 --- a/ttrun/__init__.py +++ b/ttrun/__init__.py | |||
@@ -1,16 +1,19 @@ | |||
1 | # -*- coding: utf-8 -*- | 1 | # Copyright (c) 2016 Red Hat, Inc |
2 | 2 | # | |
3 | # Licensed under the Apache License, Version 2.0 (the "License"); you may | 3 | # This file is part of ttrun |
4 | # not use this file except in compliance with the License. You may obtain | 4 | # |
5 | # a copy of the License at | 5 | # ttrun is free software: you can redistribute it and/or modify |
6 | # it under the terms of the GNU General Public License as published by | ||
7 | # the Free Software Foundation, either version 3 of the License, or | ||
8 | # (at your option) any later version. | ||
6 | # | 9 | # |
7 | # http://www.apache.org/licenses/LICENSE-2.0 | 10 | # ttrun is distributed in the hope that it will be useful, |
11 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | # GNU General Public License for more details. | ||
8 | # | 14 | # |
9 | # Unless required by applicable law or agreed to in writing, software | 15 | # You should have received a copy of the GNU General Public License |
10 | # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | 16 | # along with Ansible. If not, see <http://www.gnu.org/licenses/>. |
11 | # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
12 | # License for the specific language governing permissions and limitations | ||
13 | # under the License. | ||
14 | 17 | ||
15 | import pbr.version | 18 | import pbr.version |
16 | 19 | ||
diff --git a/ttrun/tests/base.py b/ttrun/tests/base.py deleted file mode 100644 index 1c30cdb..0000000 --- a/ttrun/tests/base.py +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | # -*- coding: utf-8 -*- | ||
2 | |||
3 | # Copyright 2010-2011 OpenStack Foundation | ||
4 | # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. | ||
5 | # | ||
6 | # Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
7 | # not use this file except in compliance with the License. You may obtain | ||
8 | # a copy of the License at | ||
9 | # | ||
10 | # http://www.apache.org/licenses/LICENSE-2.0 | ||
11 | # | ||
12 | # Unless required by applicable law or agreed to in writing, software | ||
13 | # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
14 | # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
15 | # License for the specific language governing permissions and limitations | ||
16 | # under the License. | ||
17 | |||
18 | from oslotest import base | ||
19 | |||
20 | |||
21 | class TestCase(base.BaseTestCase): | ||
22 | |||
23 | """Test case base class for all unit tests.""" | ||
diff --git a/ttrun/tests/test_ttrun.py b/ttrun/tests/test_ttrun.py index 06143b7..2156c40 100644 --- a/ttrun/tests/test_ttrun.py +++ b/ttrun/tests/test_ttrun.py | |||
@@ -1,16 +1,19 @@ | |||
1 | # -*- coding: utf-8 -*- | 1 | # Copyright (c) 2016 Red Hat, Inc |
2 | 2 | # | |
3 | # Licensed under the Apache License, Version 2.0 (the "License"); you may | 3 | # This file is part of ttrun |
4 | # not use this file except in compliance with the License. You may obtain | 4 | # |
5 | # a copy of the License at | 5 | # ttrun is free software: you can redistribute it and/or modify |
6 | # it under the terms of the GNU General Public License as published by | ||
7 | # the Free Software Foundation, either version 3 of the License, or | ||
8 | # (at your option) any later version. | ||
6 | # | 9 | # |
7 | # http://www.apache.org/licenses/LICENSE-2.0 | 10 | # ttrun is distributed in the hope that it will be useful, |
11 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | # GNU General Public License for more details. | ||
8 | # | 14 | # |
9 | # Unless required by applicable law or agreed to in writing, software | 15 | # You should have received a copy of the GNU General Public License |
10 | # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | 16 | # along with Ansible. If not, see <http://www.gnu.org/licenses/>. |
11 | # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
12 | # License for the specific language governing permissions and limitations | ||
13 | # under the License. | ||
14 | 17 | ||
15 | """ | 18 | """ |
16 | test_ttrun | 19 | test_ttrun |
@@ -19,10 +22,10 @@ test_ttrun | |||
19 | Tests for `ttrun` module. | 22 | Tests for `ttrun` module. |
20 | """ | 23 | """ |
21 | 24 | ||
22 | from ttrun.tests import base | 25 | import testtools |
23 | 26 | ||
24 | 27 | ||
25 | class TestTtrun(base.TestCase): | 28 | class TestTtrun(testtools.TestCase): |
26 | 29 | ||
27 | def test_something(self): | 30 | def test_something(self): |
28 | pass | 31 | pass |