diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2005-02-10 15:36:21 +0100 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2005-02-10 15:36:21 +0100 |
| commit | f51e090405e9ca8d4e5164ac185b0c5940acdb6a (patch) | |
| tree | 9aa7760e088705867cda53704810bb13571a7dc6 /ndb/test | |
| parent | 5af87424fd9ef409aa14ab3226441ee82273463e (diff) | |
| download | mariadb-git-f51e090405e9ca8d4e5164ac185b0c5940acdb6a.tar.gz | |
adopted test scripts
Diffstat (limited to 'ndb/test')
| -rw-r--r-- | ndb/test/ndbapi/testDict.cpp | 30 | ||||
| -rw-r--r-- | ndb/test/run-test/16node-tests.txt | 2 | ||||
| -rw-r--r-- | ndb/test/run-test/basic.txt | 2 | ||||
| -rw-r--r-- | ndb/test/run-test/daily-basic-tests.txt | 2 |
4 files changed, 19 insertions, 17 deletions
diff --git a/ndb/test/ndbapi/testDict.cpp b/ndb/test/ndbapi/testDict.cpp index 460c3e77745..5240735dcc6 100644 --- a/ndb/test/ndbapi/testDict.cpp +++ b/ndb/test/ndbapi/testDict.cpp @@ -534,13 +534,6 @@ int runTestFragmentTypes(NDBT_Context* ctx, NDBT_Step* step){ int result = NDBT_OK; NdbRestarter restarter; - // enum FragmentType { - // Unknown = 0, - // Single = 1, ///< Only one fragment - // All = 2, ///< Default value. One fragment per node group - // AllLarge = 3 ///< Sixten fragments per node group. - // }; - if (pNdb->waitUntilReady(30) != 0){ // Db is not ready, return with failure return NDBT_FAILED; @@ -575,13 +568,17 @@ int runTestFragmentTypes(NDBT_Context* ctx, NDBT_Step* step){ result = NDBT_FAILED; goto drop_the_tab; } - +/** + This test does not work since fragmentation is + decided by the kernel, hence the fragementation + attribute on the column will differ + if (newTab.equal(*pTab3) == false){ ndbout << "It was not equal" << endl; result = NDBT_FAILED; goto drop_the_tab; } - +*/ do { HugoTransactions hugoTrans(*pTab3); @@ -1598,17 +1595,22 @@ TESTCASE("CreateTableWhenDbIsFull", } TESTCASE("FragmentTypeSingle", "Create the table with fragment type Single\n"){ - TC_PROPERTY("FragmentType", 1); + TC_PROPERTY("FragmentType", NdbDictionary::Table::FragSingle); + INITIALIZER(runTestFragmentTypes); +} +TESTCASE("FragmentTypeAllSmall", + "Create the table with fragment type AllSmall\n"){ + TC_PROPERTY("FragmentType", NdbDictionary::Table::FragAllSmall); INITIALIZER(runTestFragmentTypes); } -TESTCASE("FragmentTypeAll", - "Create the table with fragment type All\n"){ - TC_PROPERTY("FragmentType", 2); +TESTCASE("FragmentTypeAllMedium", + "Create the table with fragment type AllMedium\n"){ + TC_PROPERTY("FragmentType", NdbDictionary::Table::FragAllMedium); INITIALIZER(runTestFragmentTypes); } TESTCASE("FragmentTypeAllLarge", "Create the table with fragment type AllLarge\n"){ - TC_PROPERTY("FragmentType", 3); + TC_PROPERTY("FragmentType", NdbDictionary::Table::FragAllLarge); INITIALIZER(runTestFragmentTypes); } TESTCASE("TemporaryTables", diff --git a/ndb/test/run-test/16node-tests.txt b/ndb/test/run-test/16node-tests.txt index 920448bbfd6..11ade56c28c 100644 --- a/ndb/test/run-test/16node-tests.txt +++ b/ndb/test/run-test/16node-tests.txt @@ -377,7 +377,7 @@ args: -n FragmentTypeSingle T1 max-time: 1500 cmd: testDict -args: -n FragmentTypeAll T1 T6 T7 T8 +args: -n FragmentTypeAllSmall T1 T6 T7 T8 max-time: 1500 cmd: testDict diff --git a/ndb/test/run-test/basic.txt b/ndb/test/run-test/basic.txt index a952320db08..ec9e21359e5 100644 --- a/ndb/test/run-test/basic.txt +++ b/ndb/test/run-test/basic.txt @@ -374,7 +374,7 @@ args: -n FragmentTypeSingle T1 max-time: 1500 cmd: testDict -args: -n FragmentTypeAll T1 T6 T7 T8 +args: -n FragmentTypeAllSmall T1 T6 T7 T8 max-time: 1500 cmd: testDict diff --git a/ndb/test/run-test/daily-basic-tests.txt b/ndb/test/run-test/daily-basic-tests.txt index b666f27d05f..d1be6898d2e 100644 --- a/ndb/test/run-test/daily-basic-tests.txt +++ b/ndb/test/run-test/daily-basic-tests.txt @@ -393,7 +393,7 @@ args: -n FragmentTypeSingle T1 max-time: 1500 cmd: testDict -args: -n FragmentTypeAll T1 T6 T7 T8 +args: -n FragmentTypeAllSmall T1 T6 T7 T8 max-time: 1500 cmd: testDict |