Move AllowedPrivs and similar oper information from LocalUser to OperInfo

[user/henk/code/inspircd.git] / src / testsuite.cpp

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index d9921a7b826b4527d1e3bd7a003cd40f840ba8bc..48ba4845cbbca4eb317ffeee8c92633c63eb72bb 100644 (file)
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -41,7 +41,7 @@ class TestSuiteThread : public Thread
        }
 };
 
-TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
+TestSuite::TestSuite()
 {
        cout << "\n\n*** STARTING TESTSUITE ***\n";
 
@@ -74,12 +74,16 @@ TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
                        case '2':
                                cout << "Enter module filename to load: ";
                                cin >> modname;
-                               cout << (Instance->Modules->Load(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
+                               cout << (ServerInstance->Modules->Load(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
                                break;
                        case '3':
                                cout << "Enter module filename to unload: ";
                                cin >> modname;
-                               cout << (Instance->Modules->Unload(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
+                               {
+                                       Module* m = ServerInstance->Modules->Find(modname);
+                                       cout << (ServerInstance->Modules->Unload(m) ? "\nSUCCESS!\n" : "\nFAILURE\n");
+                                       ServerInstance->AtomicActions.Run();
+                               }
                                break;
                        case '4':
                                cout << (DoThreadTests() ? "\nSUCCESS!\n" : "\nFAILURE\n");
@@ -271,7 +275,7 @@ bool TestSuite::DoThreadTests()
        cout << "Creating new ThreadEngine class...\n";
        try
        {
-               te = new ThreadEngine(ServerInstance);
+               te = new ThreadEngine;
        }
        catch (...)
        {