On Wed, May 26, 2021 at 10:26:20AM +0100, Stuart Henderson wrote: > On 2021/05/25 02:59, Dimitri Karamazov wrote: > > On Mon, May 24, 2021 at 09:54:48PM +0100, Stuart Henderson wrote: > > > ok for maturin > > > > > > py-adblock; tests fail for me like this. not necessarily a blocker, > > > do you want to send the qutebrowser diff to go with it to give a better > > > way to test? > > > > > > > > The tests are working fine upon a recheck, maybe something was wrong with > > the tarball so I've attached a new one with proper TEST_DEPENDS. > > That doesn't change anything, TEST_DEPENDS isn't needed as they're > already in BUILD_DEPENDS and you can't test without building. > Anyway; tests still fail but runtime works. > > These are OK sthen@ to import > Changed the test cmd so it directly calls the pytest module. This should work. PYTHONPATH not required anymore since the module will be installed in the tests dir itself during do-test.
All tests pass.
-TEST_ENV = PYTHONPATH=${WRKSRC}${MODPY_SITEPKG}:${MODPY_SITEPKG}
-
do-build:
${MODCARGO_CARGO_RUN} build \
--manifest-path ${MODCARGO_CARGOTOML} \
@@ -108,10 +106,10 @@ do-build:
do-test:
pip${MODPY_VERSION} install --isolated \
- --root=${WRKSRC} \
+ --target=${WRKSRC}/tests \
--ignore-installed \
--no-deps ${WRKSRC}/target/wheels/*.whl
- cd ${MODPY_TEST_DIR} && ${SETENV} ${ALL_TEST_ENV} py.test -v
+ cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} ${MODPY_BIN} -m pytest -v
py-adblock.tar.gz
Description: Binary data
maturin.tar.gz
Description: Binary data
