Skip to content

Commit

Permalink
Merge pull request #8021 from ThomasWaldmann/move-conftest.py-master
Browse files Browse the repository at this point in the history
move conftest.py to src/borg/testsuite, see #6386
  • Loading branch information
ThomasWaldmann authored Jan 2, 2024
2 parents 5379f1b + e1fbd7d commit 2803c73
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions conftest.py → src/borg/testsuite/conftest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import os
from typing import Optional
from typing import Optional, List

import pytest

Expand Down Expand Up @@ -89,7 +89,7 @@ def set_env_variables():
class ArchiverSetup:
EXE: str = None # python source based
FORK_DEFAULT = False
BORG_EXES = []
BORG_EXES: List[str] = []

def __init__(self):
self.archiver = None
Expand Down

0 comments on commit 2803c73

Please sign in to comment.