# This file is part of the ISIS IBEX application.
# Copyright (C) 2012-2016 Science & Technology Facilities Council.
# All rights reserved.
#
# This program is distributed in the hope that it will be useful.
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License v1.0 which accompanies this distribution.
# EXCEPT AS EXPRESSLY SET FORTH IN THE ECLIPSE PUBLIC LICENSE V1.0, THE PROGRAM
# AND ACCOMPANYING MATERIALS ARE PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES
# OR CONDITIONS OF ANY KIND.  See the Eclipse Public License v1.0 for more details.
#
# You should have received a copy of the Eclipse Public License v1.0
# along with this program; if not, you can obtain a copy from
# https://www.eclipse.org/org/documents/epl-v10.php or
# http://opensource.org/licenses/eclipse-1.0.php

# Add root path for access to server_commons
import os
import sys

os.environ["MYDIRBLOCK"] = os.path.abspath('..')
sys.path.insert(0, os.path.abspath(os.environ["MYDIRBLOCK"]))
# Standard imports
import unittest
import xmlrunner
import argparse

from .test_modules.options_holder_tests import TestOptionsHolderSequence
from .test_modules.exp_data_test import TestExpData
from .test_modules.database_server_test_mysql import TestDatabaseServer

DEFAULT_DIRECTORY = os.path.join('..','..','..','..','test-reports')

if __name__ == '__main__':
    # get output directory from command line arguments
    parser = argparse.ArgumentParser()
    parser.add_argument('-o', '--output_dir', nargs=1, type=str, default=[DEFAULT_DIRECTORY],
                        help='The directory to save the test reports')
    args = parser.parse_args()
    xml_dir = args.output_dir[0]

    # Load tests from test suites
    options_holder_suite = unittest.TestLoader().loadTestsFromTestCase(TestOptionsHolderSequence)
    database_server_suite = unittest.TestLoader().loadTestsFromTestCase(TestDatabaseServer)
    exp_data_suite = unittest.TestLoader().loadTestsFromTestCase(TestExpData)

    print("\n\n------ BEGINNING UNIT TESTS ------")
    ret_vals = list()
    ret_vals.append(xmlrunner.XMLTestRunner(output=xml_dir).run(options_holder_suite))
    ret_vals.append(xmlrunner.XMLTestRunner(output=xml_dir).run(database_server_suite))
    ret_vals.append(xmlrunner.XMLTestRunner(output=xml_dir).run(exp_data_suite))
    print("------ UNIT TESTS COMPLETE ------\n\n")

    # Return failure exit code if a test failed
    sys.exit(False in ret_vals)

@@ -1088,24 +1088,38 @@
 parse%0A%0Afrom 
+DatabaseServer
 .test_module
@@ -1175,24 +1175,38 @@
 quence%0Afrom 
+DatabaseServer
 .test_module
@@ -1245,16 +1245,30 @@
 ta%0Afrom 
+DatabaseServer
 .test_mo

Fix path to tests