From f216b53de855e98f5a9f2b63b61a11da8af1d2fe Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Wed, 25 Aug 2021 12:29:16 -0400 Subject: [PATCH 1/6] TST: rename the user in auth.db to "testuser" --- sirepo_bluesky/tests/SIREPO_SRDB_ROOT/auth.db | Bin 28672 -> 28672 bytes .../agent-local/.placeholder | 0 .../controls/lib/.placeholder | 0 .../controls/sI2lxUfX/sirepo-data.json | 0 .../elegant/QihrVgOD/sirepo-data.json | 0 .../elegant/RkERBeKU/sirepo-data.json | 0 .../elegant/RqqdCtsV/sirepo-data.json | 0 .../elegant/lib/.placeholder | 0 .../elegant/mVcNhyGM/sirepo-data.json | 0 .../elegant/o0wvQBbi/sirepo-data.json | 0 .../elegant/qxGfsw3c/sirepo-data.json | 0 .../elegant/zsXTc8e0/sirepo-data.json | 0 .../irad/lib/.placeholder | 0 .../jspec/66oVFzLn/sirepo-data.json | 0 .../jspec/AoPXuepr/sirepo-data.json | 0 .../jspec/lib/.placeholder | 0 .../madx/1Mku4rqp/sirepo-data.json | 0 .../madx/XPJDZpXP/sirepo-data.json | 0 .../madx/a2KWnCGX/sirepo-data.json | 0 .../madx/lib/.placeholder | 0 .../ml/ORrEYJxF/sirepo-data.json | 0 .../ml/USYeeMda/sirepo-data.json | 0 .../ml/lDUS9Tge/sirepo-data.json | 0 .../ml/lib/.placeholder | 0 .../myapp/gZcktzPt/sirepo-data.json | 0 .../myapp/lib/.placeholder | 0 .../opal/8ke79cOH/sirepo-data.json | 0 .../opal/BhyyvAf6/sirepo-data.json | 0 .../opal/Re4NRwy1/sirepo-data.json | 0 .../opal/lib/.placeholder | 0 .../opal/pVeCuhz9/sirepo-data.json | 0 .../opal/sp8E1FXr/sirepo-data.json | 0 .../opal/x7nii162/sirepo-data.json | 0 .../radia/CetVLNkk/sirepo-data.json | 0 .../radia/KuXyenXz/sirepo-data.json | 0 .../radia/M8GxWb41/sirepo-data.json | 0 .../radia/lib/.placeholder | 0 .../rcscon/lib/.placeholder | 0 .../rs4pi/lib/.placeholder | 0 .../shadow/00000001/sirepo-data.json | 0 .../shadow/2oc4qGgg/sirepo-data.json | 0 .../shadow/3GugjSu6/sirepo-data.json | 0 .../shadow/98kb3SXy/sirepo-data.json | 0 .../shadow/BuXkflTm/sirepo-data.json | 0 .../shadow/dbqIlTWL/sirepo-data.json | 0 .../shadow/dybDduXC/sirepo-data.json | 0 .../shadow/jBqgPdn3/sirepo-data.json | 0 .../shadow/lib/.placeholder | 0 .../shadow/uO8RxQLa/sirepo-data.json | 0 .../shadow/vPwfF2la/sirepo-data.json | 0 .../silas/2C3l80os/sirepo-data.json | 0 .../silas/lib/.placeholder | 0 .../srw/00000000/sirepo-data.json | 0 .../srw/00000001/sirepo-data.json | 0 .../srw/4XRca1pe/sirepo-data.json | 0 .../srw/5eignbOG/sirepo-data.json | 0 .../srw/5gfHggOS/sirepo-data.json | 0 .../srw/6goeSdTO/sirepo-data.json | 0 .../srw/7BMrabs4/sirepo-data.json | 0 .../srw/8J4F6O4s/sirepo-data.json | 0 .../srw/8kMmMmnu/sirepo-data.json | 0 .../srw/8tOXr9xu/sirepo-data.json | 0 .../srw/9tNML2BZ/sirepo-data.json | 0 .../srw/DEuV1yCB/sirepo-data.json | 0 .../srw/Dc8Nx4AP/sirepo-data.json | 0 .../srw/FT9AafDC/sirepo-data.json | 0 .../srw/GvK38bnr/sirepo-data.json | 0 .../srw/HXV1JQ5c/sirepo-data.json | 0 .../srw/I7GNUdxh/sirepo-data.json | 0 .../srw/LQhSSTHd/sirepo-data.json | 0 .../srw/Ot6R81fZ/sirepo-data.json | 0 .../srw/VfBO5liN/sirepo-data.json | 0 .../srw/ViS1qhV6/sirepo-data.json | 0 .../srw/W3HzwVcu/sirepo-data.json | 0 .../srw/WNTvDuOH/sirepo-data.json | 0 .../srw/YNze8as0/sirepo-data.json | 0 .../srw/cEsPxpm5/sirepo-data.json | 0 .../srw/cpHfvJ7Y/sirepo-data.json | 0 .../srw/dYDwW09g/sirepo-data.json | 0 .../srw/ebNOoFXY/sirepo-data.json | 0 .../srw/jmoIm0we/sirepo-data.json | 0 .../srw/kjdokwMz/sirepo-data.json | 0 .../srw/lib/_user_beam_list.json | 0 .../srw/rTGOrGdi/sirepo-data.json | 0 .../srw/szDcDQZm/sirepo-data.json | 0 .../srw/w7iEGqva/sirepo-data.json | 0 .../srw/yrqLaFMp/sirepo-data.json | 0 .../srw/ywRFaLHt/sirepo-data.json | 0 .../srw/z84ZBZRK/sirepo-data.json | 0 .../synergia/3gHwz808/sirepo-data.json | 0 .../synergia/8m5K5Zoy/sirepo-data.json | 0 .../synergia/JeUCTtIV/sirepo-data.json | 0 .../synergia/lib/.placeholder | 0 .../synergia/zI4VEBFj/sirepo-data.json | 0 .../{r5HV25DG => testuser}/tmp/.placeholder | 0 .../warppba/lib/.placeholder | 0 .../warppba/nLhGOJ4o/sirepo-data.json | 0 .../warppba/yEKsrRC8/sirepo-data.json | 0 .../warpvnd/1H0sRUMV/sirepo-data.json | 0 .../warpvnd/4wpc4kzh/sirepo-data.json | 0 .../warpvnd/J8CiSrIR/sirepo-data.json | 0 .../warpvnd/PPeivOgO/sirepo-data.json | 0 .../warpvnd/lib/.placeholder | 0 .../warpvnd/sHFNPdYz/sirepo-data.json | 0 .../zgoubi/CTstaCmK/sirepo-data.json | 0 .../zgoubi/KCtdnUFc/sirepo-data.json | 0 .../zgoubi/KG22Go8y/sirepo-data.json | 0 .../zgoubi/LGcJ90AP/sirepo-data.json | 0 .../zgoubi/WYliCQn9/sirepo-data.json | 0 .../zgoubi/bTor2aJT/sirepo-data.json | 0 .../zgoubi/bkUeVgBx/sirepo-data.json | 0 .../zgoubi/f9Om5bLZ/sirepo-data.json | 0 .../zgoubi/lib/.placeholder | 0 .../zgoubi/xizYptGE/sirepo-data.json | 0 .../zgoubi/z7V7tECo/sirepo-data.json | 0 .../zgoubi/zlOlddMs/sirepo-data.json | 0 116 files changed, 0 insertions(+), 0 deletions(-) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/agent-local/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/controls/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/controls/sI2lxUfX/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/elegant/QihrVgOD/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/elegant/RkERBeKU/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/elegant/RqqdCtsV/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/elegant/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/elegant/mVcNhyGM/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/elegant/o0wvQBbi/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/elegant/qxGfsw3c/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/elegant/zsXTc8e0/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/irad/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/jspec/66oVFzLn/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/jspec/AoPXuepr/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/jspec/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/madx/1Mku4rqp/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/madx/XPJDZpXP/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/madx/a2KWnCGX/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/madx/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/ml/ORrEYJxF/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/ml/USYeeMda/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/ml/lDUS9Tge/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/ml/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/myapp/gZcktzPt/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/myapp/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/opal/8ke79cOH/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/opal/BhyyvAf6/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/opal/Re4NRwy1/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/opal/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/opal/pVeCuhz9/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/opal/sp8E1FXr/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/opal/x7nii162/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/radia/CetVLNkk/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/radia/KuXyenXz/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/radia/M8GxWb41/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/radia/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/rcscon/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/rs4pi/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/shadow/00000001/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/shadow/2oc4qGgg/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/shadow/3GugjSu6/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/shadow/98kb3SXy/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/shadow/BuXkflTm/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/shadow/dbqIlTWL/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/shadow/dybDduXC/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/shadow/jBqgPdn3/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/shadow/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/shadow/uO8RxQLa/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/shadow/vPwfF2la/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/silas/2C3l80os/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/silas/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/00000000/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/00000001/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/4XRca1pe/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/5eignbOG/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/5gfHggOS/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/6goeSdTO/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/7BMrabs4/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/8J4F6O4s/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/8kMmMmnu/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/8tOXr9xu/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/9tNML2BZ/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/DEuV1yCB/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/Dc8Nx4AP/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/FT9AafDC/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/GvK38bnr/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/HXV1JQ5c/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/I7GNUdxh/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/LQhSSTHd/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/Ot6R81fZ/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/VfBO5liN/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/ViS1qhV6/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/W3HzwVcu/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/WNTvDuOH/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/YNze8as0/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/cEsPxpm5/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/cpHfvJ7Y/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/dYDwW09g/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/ebNOoFXY/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/jmoIm0we/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/kjdokwMz/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/lib/_user_beam_list.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/rTGOrGdi/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/szDcDQZm/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/w7iEGqva/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/yrqLaFMp/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/ywRFaLHt/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/srw/z84ZBZRK/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/synergia/3gHwz808/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/synergia/8m5K5Zoy/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/synergia/JeUCTtIV/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/synergia/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/synergia/zI4VEBFj/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/tmp/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/warppba/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/warppba/nLhGOJ4o/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/warppba/yEKsrRC8/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/warpvnd/1H0sRUMV/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/warpvnd/4wpc4kzh/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/warpvnd/J8CiSrIR/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/warpvnd/PPeivOgO/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/warpvnd/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/warpvnd/sHFNPdYz/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/zgoubi/CTstaCmK/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/zgoubi/KCtdnUFc/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/zgoubi/KG22Go8y/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/zgoubi/LGcJ90AP/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/zgoubi/WYliCQn9/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/zgoubi/bTor2aJT/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/zgoubi/bkUeVgBx/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/zgoubi/f9Om5bLZ/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/zgoubi/lib/.placeholder (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/zgoubi/xizYptGE/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/zgoubi/z7V7tECo/sirepo-data.json (100%) rename sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/{r5HV25DG => testuser}/zgoubi/zlOlddMs/sirepo-data.json (100%) diff --git a/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/auth.db b/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/auth.db index 5d2161ed07398fd1aff9a95dec66c2124653e047..6ef331a586e1cfc929f12b8654760065de4e5417 100644 GIT binary patch delta 298 zcmZp8z}WDBae_3X@I)DBR$&Ic;Dn7SbM?9TZ!j?OZ(!ixz`tR$pu-aW$s6q1I7(8B zOG=AVize^0mttXHV9=P@sKUd={{^V@IRpQ5{^vlY*Z3y}u(Q-^xFazY7943mTO1+Y7NV%Syxa6cnZAW|roPvNFpm!o*VZN>YmoiZY8+ z`B<1`g<-;pDY-zCttU2`i*NxM%>0KK_}}wi=Rd^X3W7kxOZXXsCN^5yiLl5@!(9cn YflZu6RuL|Uu!2>9MOGLt4zz;>0DW{=6aWAK delta 438 zcmZp8z}WDBae_1>|3n#QR(=LO?+F`I=IV1ZFfcIjZ(!iR!M|a%pu-aW$s6q1IEqX? z!i-E^+$Zm|moiafWRZ1b2u=wwP7F15H!?6X)HN{CH8N5#w6HQTvobZ+votd|urTBT z8}*!l{|oFxv+=hw@N<6vhQ(q2P5iU?TY(NL Date: Wed, 25 Aug 2021 15:40:59 -0400 Subject: [PATCH 2/6] CI: add scheduled nightly runs at 4 am; more verbose pytest output --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e9739a9c..8acea8f9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,6 +3,8 @@ name : tests on: push: pull_request: + schedule: + - cron: '00 4 * * *' # daily at 4AM jobs: build: @@ -65,4 +67,4 @@ jobs: set -vxeuo pipefail source $CONDA/etc/profile.d/conda.sh conda activate test - pytest -s -v sirepo_bluesky/tests + pytest -s -vv sirepo_bluesky/tests From 7b415f4121ce933b93e3d579765b11faf315b071 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Wed, 25 Aug 2021 15:45:22 -0400 Subject: [PATCH 3/6] TST: fix the simulationId in .json files in 00000000/00000001 dirs --- .../user/testuser/shadow/00000001/sirepo-data.json | 2 +- .../user/testuser/srw/00000000/sirepo-data.json | 2 +- .../user/testuser/srw/00000001/sirepo-data.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/testuser/shadow/00000001/sirepo-data.json b/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/testuser/shadow/00000001/sirepo-data.json index d158002c..5ea9d29e 100644 --- a/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/testuser/shadow/00000001/sirepo-data.json +++ b/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/testuser/shadow/00000001/sirepo-data.json @@ -123,7 +123,7 @@ "name": "basic (from SRW)", "notes": "", "npoint": 100000, - "simulationId": "0jcPUrn9", + "simulationId": "00000001", "simulationSerial": 1629134267786670, "sourceType": "geometricSource" }, diff --git a/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/testuser/srw/00000000/sirepo-data.json b/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/testuser/srw/00000000/sirepo-data.json index 81fbbe60..a137fd3a 100644 --- a/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/testuser/srw/00000000/sirepo-data.json +++ b/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/testuser/srw/00000000/sirepo-data.json @@ -527,7 +527,7 @@ "photonEnergy": "4240", "sampleFactor": 1, "samplingMethod": 1, - "simulationId": "LFPH22wg", + "simulationId": "00000000", "simulationSerial": 1629134393894456, "sourceType": "u", "verticalPointCount": 100, diff --git a/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/testuser/srw/00000001/sirepo-data.json b/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/testuser/srw/00000001/sirepo-data.json index 20c5e8da..19e92359 100644 --- a/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/testuser/srw/00000001/sirepo-data.json +++ b/sirepo_bluesky/tests/SIREPO_SRDB_ROOT/user/testuser/srw/00000001/sirepo-data.json @@ -393,7 +393,7 @@ "photonEnergy": "9000", "sampleFactor": 1, "samplingMethod": 1, - "simulationId": "jUhMGDzv", + "simulationId": "00000001", "simulationSerial": 1629134295111526, "sourceType": "g", "verticalPointCount": 100, From bac18ac2d56c027746fa5f6357cd23ba6c9bf77d Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 26 Aug 2021 01:20:24 -0400 Subject: [PATCH 4/6] CI: print docker logs --- .github/workflows/tests.yml | 16 ++++++++++------ scripts/start_docker.sh | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8acea8f9..641a4a30 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,7 +24,10 @@ jobs: uses: supercharge/mongodb-github-action@1.6.0 - name: start Sirepo-Bluesky container - run: bash scripts/start_docker.sh -d + run: | + set -vxeuo pipefail + . scripts/start_docker.sh -d + echo $SIREPO_DOCKER_CONTAINER_ID >> $GITHUB_ENV - name: is Sirepo-Bluesky running? run: docker ps -a @@ -34,11 +37,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - #- name: Add conda to system path - #run: | - # $CONDA is an environment variable pointing to the root of the miniconda directory - #echo $CONDA/bin >> $GITHUB_PATH - - name: Create conda environment run: | # For reference: https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html. @@ -68,3 +66,9 @@ jobs: source $CONDA/etc/profile.d/conda.sh conda activate test pytest -s -vv sirepo_bluesky/tests + status=$? + echo "Sirepo Docker container id: ${SIREPO_DOCKER_CONTAINER_ID}" + docker logs ${SIREPO_DOCKER_CONTAINER_ID} + if [ $status -gt 0 ]; then + exit $status + fi diff --git a/scripts/start_docker.sh b/scripts/start_docker.sh index b8c873fb..f423dd1e 100644 --- a/scripts/start_docker.sh +++ b/scripts/start_docker.sh @@ -1,5 +1,19 @@ #!/bin/bash +# set -vxeuo pipefail + +error_msg="Specify '-it' or '-d' on the command line as a first argument." + +if [ -z "$1" ]; then + echo "${error_msg}" + exit 1 +elif [ "$1" != "-it" -a "$1" != "-d" ]; then + echo "${error_msg} Specified argument: ${1}" + exit 2 +fi + +unset cmd _cmd docker_image SIREPO_DOCKER_CONTAINER_ID + month=$(date +"%m") day=$(date +"%d") year=$(date +"%Y") @@ -8,26 +22,36 @@ today="${HOME}/tmp/data/${year}/${month}/${day}" docker_image="radiasoft/sirepo:beta" -if [ -d "${today}" ] -then +if [ -d "${today}" ]; then echo "Directory ${today} exists." else echo "Creating Directory ${today}" mkdir -p "${today}" fi -ls -l $HOME/tmp +# ls -l $HOME/tmp docker pull ${docker_image} docker images -# specify -it or -d on the command line -docker run $1 --init --rm --name sirepo \ +in_docker_cmd="mkdir -v -p /sirepo/ && cp -Rv /SIREPO_SRDB_ROOT/* /sirepo/ && sirepo service http" +cmd="docker run $1 --init --rm --name sirepo \ -e SIREPO_AUTH_METHODS=bluesky:guest \ -e SIREPO_AUTH_BLUESKY_SECRET=bluesky \ -e SIREPO_SRDB_ROOT=/sirepo \ -e SIREPO_COOKIE_IS_SECURE=false \ -p 8000:8000 \ -v $PWD/sirepo_bluesky/tests/SIREPO_SRDB_ROOT:/SIREPO_SRDB_ROOT:ro,z \ - ${docker_image} bash -l -c "mkdir -v -p /sirepo/ && cp -Rv /SIREPO_SRDB_ROOT/* /sirepo/ && sirepo service http" + ${docker_image} bash -l -c \"${in_docker_cmd}\"" + +echo -e "Command to run:\n\n${cmd}\n" +if [ "$1" == "-d" ]; then + SIREPO_DOCKER_CONTAINER_ID=$(eval ${cmd}) + export SIREPO_DOCKER_CONTAINER_ID + echo "Container ID: ${SIREPO_DOCKER_CONTAINER_ID}" + docker ps -a + docker logs ${SIREPO_DOCKER_CONTAINER_ID} +else + eval ${cmd} +fi From 2c5387d93e848b4773858cb2ae6d01b25b9ee304 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 26 Aug 2021 01:25:19 -0400 Subject: [PATCH 5/6] CI: fix env var --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 641a4a30..ff12ad1a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,8 @@ jobs: run: | set -vxeuo pipefail . scripts/start_docker.sh -d - echo $SIREPO_DOCKER_CONTAINER_ID >> $GITHUB_ENV + export SIREPO_DOCKER_CONTAINER_ID + echo "SIREPO_DOCKER_CONTAINER_ID=${SIREPO_DOCKER_CONTAINER_ID}" >> $GITHUB_ENV - name: is Sirepo-Bluesky running? run: docker ps -a From e5860d161eea45dbe48004319c41b5f20348caff Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 26 Aug 2021 02:05:32 -0400 Subject: [PATCH 6/6] Inform from what sim a copy is created in sirepo_flyer.py --- sirepo_bluesky/sirepo_flyer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sirepo_bluesky/sirepo_flyer.py b/sirepo_bluesky/sirepo_flyer.py index e7ee59fa..1ef3740e 100644 --- a/sirepo_bluesky/sirepo_flyer.py +++ b/sirepo_bluesky/sirepo_flyer.py @@ -217,7 +217,9 @@ def kickoff(self): for i in range(len(self.params_to_change)): # name doesn't need to be unique, server will rename it c1 = sb.copy_sim('{} Bluesky'.format(sb.data['models']['simulation']['name']), ) - print('copy {}, {}'.format(c1.sim_id, c1.data['models']['simulation']['name'])) + print('copy {} -> {}, {}'.format(sb.data['models']['simulation']['simulationId'], + c1.sim_id, + c1.data['models']['simulation']['name'])) for key, parameters_to_update in self.params_to_change[i].items(): optic_id = sb.find_optic_id_by_name(key)