Merge branch 'BUG19169143' into develop

peeyushgupta · peeyushgupta · commit 902ad1cfc1b5 · 2014-08-07T12:46:08.000+05:30
diff --git a/lib/mysql/connector/optionfiles.py b/lib/mysql/connector/optionfiles.py
@@ -109,6 +109,9 @@ def _parse_options(self, files):
 
         for file_ in files:
             try:
+                if file_ in files[index+1:]:
+                    raise ValueError("Same option file '{0}' occurring more "
+                                     "than once in the list".format(file_))
                 with open(file_, 'r') as op_file:
                     for line in op_file.readlines():
                         if line.startswith('!includedir'):
@@ -129,7 +132,7 @@ def _parse_options(self, files):
                                     filename, file_))
                             files.insert(index+1, filename)
 
-                        index += 1
+                    index += 1
 
             except (IOError, OSError) as exc:
                 raise ValueError("Failed reading file '{0}': {1}".format(
diff --git a/tests/test_bugs.py b/tests/test_bugs.py
@@ -2741,3 +2741,17 @@ def test_duplicate_groups(self):
         }
         self.assertEqual(exp, cnx._read_option_files(
             {'option_files': opt_file}))
+
+
+class BugOra19169143(tests.MySQLConnectorTests):
+    """BUG#19169143: FAILURE IN RAISING ERROR WITH DUPLICATE OPTION_FILES
+    """
+    def test_duplicate_optionfiles(self):
+        option_file_dir = os.path.join('tests', 'data', 'option_files')
+        files = [
+            os.path.join(option_file_dir, 'include_files', '1.cnf'),
+           os.path.join(option_file_dir, 'include_files', '2.cnf'),
+            os.path.join(option_file_dir, 'include_files', '1.cnf'),
+        ]
+        self.assertRaises(ValueError, mysql.connector.connect,
+                          option_files=files)
