Skip to content

Commit c5c9480

Browse files
committed
Potential fix for intermittent doc test error
1 parent 13f7645 commit c5c9480

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

docs/conftest.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ def trolley(a_trolley):
5858
return a_trolley
5959

6060

61+
@pytest.fixture
62+
def an_instance():
63+
an_instance = Mock(spec=Instance)
64+
an_instance.data = quick_dataset(Rows=100)
65+
return an_instance
66+
67+
6168
class NoSaveStorageDir(StorageDir):
6269
def save(self, dataset, path=None):
6370
"""Do not actually write to disk"""
@@ -72,12 +79,6 @@ def no_storage(monkeypatch):
7279
return NoSaveStorageDir
7380

7481

75-
def get_an_instance():
76-
an_instance = Mock(spec=Instance)
77-
an_instance.data = quick_dataset(Rows=100)
78-
return an_instance
79-
80-
8182
def setup_namespace(namespace: Dict[str, Any]):
8283
"""All imports done before each of the examples in docs"""
8384

@@ -97,7 +98,6 @@ def setup_namespace(namespace: Dict[str, Any]):
9798
"a_session": Mock(spec=Session),
9899
"a_searcher": Mock(spec=Searcher),
99100
"a_downloader": Mock(spec=Downloader),
100-
"an_instance": get_an_instance(),
101101
"StudyReference": StudyReference,
102102
"SeriesReference": SeriesReference,
103103
"InstanceReference": InstanceReference,
@@ -111,6 +111,6 @@ def setup_namespace(namespace: Dict[str, Any]):
111111
pytest_collect_file = Sybil(
112112
parsers=[PythonCodeBlockParser()],
113113
pattern="*.md",
114-
fixtures=["mock_requests", "no_storage", "trolley"],
114+
fixtures=["mock_requests", "no_storage", "trolley", "an_instance"],
115115
setup=setup_namespace,
116116
).pytest()

docs/usage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ studies = trolley.find_studies( # find studies series and instances
4545
query_level=QueryLevels.INSTANCE))
4646

4747
a_series = studies[0].series[0] # studies now contain series
48-
an_instance = a_series.instances[0] # and series contain instances
48+
an_instance = a_series.instances[0] # and series contain instances
4949
```
5050
Data sent back by the server is parsed in a DICOM object hierarchy. Each object stores its additional data in the
5151
`data` field. This field is a [pydicom.Dataset](

0 commit comments

Comments
 (0)