Commit 5e0781ef authored by Kean Johnston's avatar Kean Johnston
Browse files

Merge branch 'trac2904_v3'

parents fb631319 d449fb5d
......@@ -84,7 +84,7 @@ TEST(Element, from_and_to_json) {
sv.push_back("\"asdf\"");
sv.push_back("null");
sv.push_back("[ 1, 2, 3, 4 ]");
sv.push_back("{ \"name\": \"foo\", \"value\": 47806 }");
sv.push_back("{ \"name\": \"foo\", \"value\": 56176 }");
sv.push_back("[ { \"a\": 1, \"b\": \"c\" }, { \"a\": 2, \"b\": \"d\" } ]");
sv.push_back("8.23");
sv.push_back("123.456");
......@@ -570,12 +570,12 @@ TEST(Element, ListElement) {
el->set(0, Element::fromJSON("\"foo\""));
EXPECT_EQ(el->get(0)->stringValue(), "foo");
el->add(Element::create(47806));
EXPECT_EQ(el->get(3)->intValue(), 47806);
el->add(Element::create(56176));
EXPECT_EQ(el->get(3)->intValue(), 56176);
el->remove(1);
el->remove(1);
EXPECT_EQ(el->str(), "[ \"foo\", 47806 ]");
EXPECT_EQ(el->str(), "[ \"foo\", 56176 ]");
// hmm, it errors on EXPECT_THROW(el->get(3), std::out_of_range)
EXPECT_ANY_THROW(el->get(3));
......@@ -600,8 +600,8 @@ TEST(Element, MapElement) {
EXPECT_TRUE(isNull(el->get("value3")));
el->set("value3", Element::create(47806));
EXPECT_EQ(el->get("value3")->intValue(), 47806);
el->set("value3", Element::create(56176));
EXPECT_EQ(el->get("value3")->intValue(), 56176);
el->remove("value3");
EXPECT_TRUE(isNull(el->get("value3")));
......
......@@ -102,7 +102,7 @@
"item_name": "v92b",
"item_type": "integer",
"item_optional": false,
"item_default": 47806
"item_default": 56176
}
]
}
......
......@@ -107,7 +107,7 @@
"item_name": "v92b",
"item_type": "integer",
"item_optional": false,
"item_default": 47806
"item_default": 56176
}
]
}
......
......@@ -334,10 +334,10 @@ class testSession(unittest.TestCase):
self.assertEqual(sess._sequence, 1)
self.assertEqual(sess._next_sequence(), 2)
self.assertEqual(sess._sequence, 2)
sess._sequence = 47805
self.assertEqual(sess._sequence, 47805)
self.assertEqual(sess._next_sequence(), 47806)
self.assertEqual(sess._sequence, 47806)
sess._sequence = 56175
self.assertEqual(sess._sequence, 56175)
self.assertEqual(sess._next_sequence(), 56176)
self.assertEqual(sess._sequence, 56176)
def test_group_subscribe(self):
sess = MySession()
......
......@@ -667,7 +667,7 @@ class TestMultiConfigData(unittest.TestCase):
'modified': False,
'name': 'Spec22/value9/v92/v92b',
'type': 'integer',
'value': 47806
'value': 56176
}
]
maps = self.mcd.get_value_maps("/Spec22/value9")
......
......@@ -21,9 +21,9 @@ it is called python-pip. On FreeBSD the port is devel/py-pip.
Running the tests
-----------------
At this moment, we have a fixed port for local tests in our setups, port 47806.
At this moment, we have a fixed port for local tests in our setups, port 56176.
This port must be free. (TODO: can we make this run-time discovered?).
Port 47805 is used for cmdctl, and must also be available.
Port 56175 is used for cmdctl, and must also be available.
(note, we will need to extend this to a range, or if possible, we will need to
do some on-the-fly available port finding)
......
Note well:
In some configuration we intentionally use an IPv6 address (::1) with
port 47807. DO NOT CHANGE THAT; at least do not change it to
127.0.0.1:47807. See git e3f4b290d17a68db728166cdffcbe93517966e8b
for why.
......@@ -9,7 +9,7 @@
},
"Auth": {
"listen_on": [{
"port": 47806,
"port": 56176,
"address": "127.0.0.1"
}]
},
......
......@@ -9,7 +9,7 @@
},
"Auth": {
"listen_on": [ {
"port": 47806,
"port": 56176,
"address": "127.0.0.1"
} ]
},
......
......@@ -10,7 +10,7 @@
"Auth": {
"database_file": "data/example.org.sqlite3",
"listen_on": [ {
"port": 47806,
"port": 56176,
"address": "127.0.0.1"
} ]
},
......
......@@ -10,7 +10,7 @@
"Auth": {
"database_file": "data/example.org.sqlite3",
"listen_on": [ {
"port": 47806,
"port": 56176,
"address": "127.0.0.1"
} ]
},
......
......@@ -21,7 +21,7 @@
"database_file": "data/ddns/example.org.sqlite3",
"listen_on": [
{
"port": 47806,
"port": 56176,
"address":
"127.0.0.1"
}
......
......@@ -14,7 +14,7 @@
"database_file": "data/ddns/example.org.sqlite3",
"listen_on": [
{
"port": 47806,
"port": 56176,
"address": "127.0.0.1"
}
]
......
......@@ -10,7 +10,7 @@
"Auth": {
"database_file": "data/example.org.sqlite3",
"listen_on": [ {
"port": 47806,
"port": 56176,
"address": "127.0.0.1"
} ]
},
......
......@@ -9,7 +9,7 @@
},
"Auth": {
"listen_on": [{
"port": 47806,
"port": 56176,
"address": "127.0.0.1"
}]
},
......
......@@ -11,7 +11,7 @@
"Auth": {
"database_file": "data/example.org.sqlite3",
"listen_on": [ {
"port": 47807,
"port": 56177,
"address": "::1"
} ]
},
......
......@@ -9,7 +9,7 @@
},
"Auth": {
"listen_on": [{
"port": 47806,
"port": 56176,
"address": "127.0.0.1"
}]
},
......
......@@ -9,7 +9,7 @@
},
"Auth": {
"listen_on": [ {
"port": 47806,
"port": 56176,
"address": "127.0.0.1"
} ]
},
......
......@@ -29,11 +29,11 @@
"database_file": "data/ixfr-out/zones.sqlite3",
"listen_on": [
{
"port": 47806,
"port": 56176,
"address": "::"
},
{
"port": 47806,
"port": 56176,
"address": "0.0.0.0"
}
]
......
......@@ -10,7 +10,7 @@
"Auth": {
"database_file": "data/test_nonexistent_db.sqlite3",
"listen_on": [ {
"port": 47806,
"port": 56176,
"address": "127.0.0.1"
} ]
},
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment