Merge pull request #332 from ooni/issue/2576

ooni · Nov 22, 2023 · ef7ee7a · ef7ee7a
2 parents 3dc4b4d + 48246e3
commit ef7ee7a
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 144 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -62,7 +62,7 @@ probe-cli: 3.9.2
 - Updated dependencies: `ooni-components`, `styled-components`, `rebass`
 - Pin to `[email protected]` because 5.2.x introduces this bug: styled-components/styled-components#3273
 - Use `Modal` component from `ooni-components` instead of the forked one in the repo.
-- Moved icons for Signal and RiseupVPN tests to `ooni-comopnents`
+- Moved icons for Signal and RiseupVPN tests to `ooni-components`
 
 ### Removed
 

diff --git a/main/utils/ooni/run.js b/main/utils/ooni/run.js
@@ -18,7 +18,6 @@ class Runner {
     } catch (e) {
       log.debug(`Failed to find a running ooniprobe process to kill. code: ${e.code}`)
     }
-
   }
 
   run() {

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "author": "Open Observatory of Network Interference (OONI) <[email protected]>",
   "productName": "OONI Probe",
   "version": "3.9.1",
-  "probeVersion": "3.17.5",
+  "probeVersion": "3.19.1",
   "main": "main/index.js",
   "license": "BSD-3-Clause",
   "repository": "ooni/probe-desktop",

diff --git a/renderer/components/measurement/MeasurementContainer.js b/renderer/components/measurement/MeasurementContainer.js
@@ -26,7 +26,6 @@ import { NDT } from '../nettests/performance/NDT'
 import { Dash } from '../nettests/performance/Dash'
 import { Psiphon } from '../nettests/circumvention/Psiphon'
 import { Tor } from '../nettests/circumvention/Tor'
-import { RiseupVPN } from '../nettests/circumvention/RiseupVPN'
 import { Signal } from '../nettests/im/Signal'
 
 import FullHeightFlex from '../FullHeightFlex'
@@ -48,7 +47,6 @@ const detailsMap = {
   dash: Dash,
   psiphon: Psiphon,
   tor: Tor,
-  riseupvpn: RiseupVPN,
   signal: Signal,
 }
 

diff --git a/renderer/components/nettests/circumvention/RiseupVPN.js b/renderer/components/nettests/circumvention/RiseupVPN.js
diff --git a/renderer/components/nettests/index.js b/renderer/components/nettests/index.js
@@ -23,7 +23,6 @@ import ndt from './performance/NDT'
 import dash from './performance/Dash'
 import psiphon from './circumvention/Psiphon'
 import tor from './circumvention/Tor'
-import riseupvpn from './circumvention/RiseupVPN'
 import signal from './im/Signal'
 import { default as animation } from '../../public/static/animations/loadingTests.json'
 
@@ -71,7 +70,7 @@ export const tests = {
   dash,
   psiphon,
   tor,
-  riseupvpn,
+  riseupvpn: minimalTest('riseupvpn'),
   signal,
   stunreachability: minimalTest('stunreachability'),
   dnscheck: minimalTest('dnscheck'),
@@ -105,6 +104,5 @@ export const cliTestKeysToGroups = {
   'nettests.NDT': 'performance',
   'nettests.Psiphon': 'circumvention',
   'nettests.Tor': 'circumvention',
-  'nettests.RiseupVPN': 'circumvention',
   'nettests.Signal': 'im',
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,6 @@ class Runner { @@
         } catch (e) {
           log.debug(`Failed to find a running ooniprobe process to kill. code: ${e.code}`)
         }
       }
       run() {
@@ Expand Down @@