Merge lp:~canonical-platform-qa/qakit/fix_config into lp:qakit

[Santiago Baldassin]

Fixing the config conflicts

Fixing the config conflicts

[Sergio Cazzolato (sergio-j-cazzolato)]

code lgtm

review: Approve

=== removed directory 'qakit/config'
=== modified file 'qakit/config.py'
--- qakit/config.py	2016-01-26 13:22:00 +0000
+++ qakit/config.py	2016-09-15 19:34:18 +0000
@@ -18,6 +18,7 @@
 """Functions for configuration parsing."""
 
 import os.path
+from configparser import ConfigParser
 
 
 def get_config_file_location():
@@ -25,3 +26,12 @@
     QAKIT_CONFIG env variable is defined, it is be used, otherwise it is
     used the default config file in .config dir"""
     return os.getenv('QAKIT_CONFIG', os.path.expanduser('~/.config/qakit.ini'))
+
+
+class Config:
+
+    def __init__(self):
+        self.parser = ConfigParser()
+        conf_file = os.getenv('QAKIT_CONFIG',
+                              os.path.expanduser('~/.config/qakit.ini'))
+        self.parser.read(conf_file)
\ No newline at end of file

=== removed file 'qakit/config/__init__.py'
--- qakit/config/__init__.py	2016-09-03 11:30:49 +0000
+++ qakit/config/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-# Copyright (C) 2016 Canonical
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.

=== removed file 'qakit/config/config.py'
--- qakit/config/config.py	2016-09-06 12:05:20 +0000
+++ qakit/config/config.py	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-# Copyright (C) 2016 Canonical
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-from configparser import ConfigParser
-
-
-class Config:
-
-    def __init__(self):
-        self.parser = ConfigParser()
-        conf_file = os.getenv('QAKIT_CONFIG',
-                              os.path.expanduser('~/.config/qakit.ini'))
-        self.parser.read(conf_file)

=== modified file 'qakit/ust/worker.py'
--- qakit/ust/worker.py	2016-09-15 18:35:45 +0000
+++ qakit/ust/worker.py	2016-09-15 19:34:18 +0000
@@ -19,7 +19,7 @@
 from pika import BlockingConnection
 from pika import ConnectionParameters
 
-from qakit.config.config import Config
+from qakit.config import Config
 from qakit.launchpad.ppa import Ppa
 from qakit.practitest.practitest import PractitestSession