Skip to content

Commit 6ae3fc3

Browse files
committed
logging test passing
1 parent c85403f commit 6ae3fc3

File tree

5 files changed

+20
-38
lines changed

5 files changed

+20
-38
lines changed

src/warnet/cli/network.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def _connected():
154154
manuals += 1
155155
# Even if more edges are specifed, bitcoind only allows
156156
# 8 manual outbound connections
157-
157+
158158
print("manual " + str(manuals))
159159
print(tank.metadata.annotations["init_peers"])
160160
if min(8, int(tank.metadata.annotations["init_peers"])) > manuals:

test/data/logging.graphml

Lines changed: 0 additions & 35 deletions
This file was deleted.

test/data/logging/network.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
nodes:
2+
- name: tank-0000
3+
connect:
4+
- tank-0002
5+
metricsExport: true
6+
- name: tank-0001
7+
connect:
8+
- tank-0002
9+
metricsExport: true
10+
metrics: txrate=getchaintxstats(10)["txrate"]
11+
- name: tank-0002
12+
connect:
13+
- tank-0000

test/data/logging/node-defaults.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image:
2+
repository: bitcoindevproject/bitcoin
3+
pullPolicy: IfNotPresent
4+
tag: "27.0"

test/logging_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class LoggingTest(TestBase):
1515
def __init__(self):
1616
super().__init__()
17-
self.graph_file_path = Path(os.path.dirname(__file__)) / "data" / "logging.graphml"
17+
self.network_dir = Path(os.path.dirname(__file__)) / "data" / "logging"
1818
self.scripts_dir = Path(os.path.dirname(__file__)) / ".." / "resources" / "scripts"
1919
self.connect_logging_process = None
2020
self.connect_logging_thread = None
@@ -54,7 +54,7 @@ def start_logging(self):
5454

5555
def setup_network(self):
5656
self.log.info("Setting up network")
57-
self.log.info(self.warcli(f"network deploy ./resources/networks/6_node_bitcoin"))
57+
self.log.info(self.warcli(f"network deploy {self.network_dir}"))
5858
self.wait_for_all_tanks_status(target="running", timeout=10 * 60)
5959
self.wait_for_all_edges()
6060

0 commit comments

Comments
 (0)